From 05f06286f4def575fbde0c4e2df0760460b72f2f Mon Sep 17 00:00:00 2001 From: Liangent Date: Fri, 25 Oct 2013 18:53:12 +0000 Subject: [PATCH] (bug 56184) Allow 3-way merge from arbitrary revisions Change-Id: Iaceecb26062266ccd9a1c63c126ff0d5471f7d97 --- includes/EditPage.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/includes/EditPage.php b/includes/EditPage.php index 7115eabdd0..aeb9e5038b 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -930,10 +930,6 @@ class EditPage { $undo = $wgRequest->getInt( 'undo' ); if ( $undo > 0 && $undoafter > 0 ) { - if ( $undo < $undoafter ) { - # If they got undoafter and undo round the wrong way, switch them - list( $undo, $undoafter ) = array( $undoafter, $undo ); - } $undorev = Revision::newFromId( $undo ); $oldrev = Revision::newFromId( $undoafter ); @@ -942,8 +938,6 @@ class EditPage { # the revisions exist and they were not deleted. # Otherwise, $content will be left as-is. if ( !is_null( $undorev ) && !is_null( $oldrev ) && - $undorev->getPage() == $oldrev->getPage() && - $undorev->getPage() == $this->mTitle->getArticleID() && !$undorev->isDeleted( Revision::DELETED_TEXT ) && !$oldrev->isDeleted( Revision::DELETED_TEXT ) ) { -- 2.20.1